Merge tag 'upstream/1.0.2'
authorAron Xu <aron@debian.org>
Thu, 20 Nov 2014 09:03:20 +0000 (17:03 +0800)
committerAron Xu <aron@debian.org>
Thu, 20 Nov 2014 09:03:20 +0000 (17:03 +0800)
commitfc2d5f7ab2ca63e6b7acd061245698c633e32a48
treec0155a6d17dee841c7cd2ef8fffd6216bc98cdd4
parentd9625e86803a7238c640a2be56e60e60d2c00f67
parent66ecf82ffc282755eca89b4ba1ce5ae211aa3f39
Merge tag 'upstream/1.0.2'

Upstream version 1.0.2